Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 26 Nov 2005 01:21:55 +0000 (01:21 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 26 Nov 2005 01:21:55 +0000 (01:21 +0000)

Trivial merge